* sysdep.c (LC_COLLATE, LC_COLLATE_MASK): Give individual defaults.

Fixes: debbugs:18051

diff --git a/src/ChangeLog b/src/ChangeLog
index a7c8cb59a0ff4cb350d0c8be3b359853b9fcb4e0..e79cef6a8a4f1ffe294c8202d3e795f7cbb5e0c6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * sysdep.c (LC_COLLATE, LC_COLLATE_MASK): Give individual defaults
+       (Bug#18051).
+
 2014-08-27  Eli Zaretskii  <eliz@gnu.org>
 
        * syntax.c (scan_lists): Don't examine positions before BEGV.

diff --git a/src/sysdep.c b/src/sysdep.c
index d50e2398a53a1f6a7f4156e6722c26678b503510..a336a1e90580e1e3449f974073f74829e509cfd0 100644 (file)
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -3601,8 +3601,11 @@ system_process_attributes (Lisp_Object pid)
 
 # if defined HAVE_NEWLOCALE || defined HAVE_SETLOCALE
 #  include <locale.h>
-# else
+# endif
+# ifndef LC_COLLATE
 #  define LC_COLLATE 0
+# endif
+# ifndef LC_COLLATE_MASK
 #  define LC_COLLATE_MASK 0
 # endif
 # ifndef HAVE_NEWLOCALE